diff --git a/src/autoapp/Service/AndroidAutoEntity.cpp b/src/autoapp/Service/AndroidAutoEntity.cpp
index 5b93722..54b14b6 100644
--- a/src/autoapp/Service/AndroidAutoEntity.cpp
+++ b/src/autoapp/Service/AndroidAutoEntity.cpp
@@ -60,7 +60,7 @@ void AndroidAutoEntity::start(IAndroidAutoEntityEventHandler& eventHandler)
 
         eventHandler_ = eventHandler;
         std::for_each(serviceList_.begin(), serviceList_.end(), std::bind(&IService::start, std::placeholders::_1));
-        this->schedulePing();
+        //this->schedulePing();
 
         auto versionRequestPromise = aasdk::channel::SendPromise::defer(strand_);
         versionRequestPromise->then([]() {}, std::bind(&AndroidAutoEntity::onChannelError, this->shared_from_this(), std::placeholders::_1));
@@ -77,7 +77,7 @@ void AndroidAutoEntity::stop()
         try {
             eventHandler_ = nullptr;
             std::for_each(serviceList_.begin(), serviceList_.end(), std::bind(&IService::stop, std::placeholders::_1));
-            pinger_->cancel();
+            //pinger_->cancel();
             messenger_->stop();
             transport_->stop();
             cryptor_->deinit();
diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp
index ae21ef1..7a6656e 100644
--- a/src/autoapp/UI/MainWindow.cpp
+++ b/src/autoapp/UI/MainWindow.cpp
@@ -1137,7 +1137,14 @@ void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonList_clicked()
     ui_->PlayerPlayingWidget->hide();
     ui_->pushButtonList->hide();
     ui_->pushButtonPlayerPlayList->show();
-    ui_->pushButtonBackToPlayer->show();
+
+    if (playlist->currentIndex() == -1) {
+        ui_->pushButtonPlayerStop->hide();
+        ui_->pushButtonPlayerPause->hide();
+        ui_->pushButtonBackToPlayer->hide();
+    } else {
+        ui_->pushButtonBackToPlayer->show();
+    }
 }
 
 void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerStop_clicked()
@@ -1289,6 +1296,25 @@ void f1x::openauto::autoapp::ui::MainWindow::metaDataChanged()
     ui_->labelTrack->setText(QString::number(playlist->currentIndex()+1));
     ui_->labelTrackCount->setText(QString::number(playlist->mediaCount()));
 
+    if (playlist->currentIndex() == -1) {
+        // check for folder icon
+        QString cover = this->musicfolder + "/" + this->albumfolder + "/folder.png";
+        QString coverjpg = this->musicfolder + "/" + this->albumfolder + "/folder.jpg";
+        if (check_file_exist(cover.toStdString().c_str())) {
+            QPixmap img = cover;
+            ui_->pushButtonBack->setIcon(img.scaled(270,270,Qt::KeepAspectRatio));
+        } else if (check_file_exist(coverjpg.toStdString().c_str())) {
+            QPixmap img = coverjpg;
+            ui_->pushButtonBack->setIcon(img.scaled(270,270,Qt::KeepAspectRatio));
+        } else {
+            ui_->pushButtonBack->setIcon(QPixmap("://coverlogo.png"));
+        }
+        ui_->labelCurrentPlaying->setText(ui_->comboBoxAlbum->currentText());
+        ui_->pushButtonPlayerStop->hide();
+        ui_->pushButtonPlayerPause->hide();
+        ui_->pushButtonPlayerPlayList->show();
+    }
+
     // Write current playing album and track to config
     this->configuration_->setMp3Track(playlist->currentIndex());
     this->configuration_->setMp3SubFolder(ui_->comboBoxAlbum->currentText().toStdString());
@@ -1300,6 +1326,7 @@ void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerPlayList_clicked
     player->setPlaylist(this->playlist);
     playlist->setCurrentIndex(this->currentPlaylistIndex);
     player->play();
+    ui_->pushButtonBack->setIcon(QPixmap("://coverlogo.png"));
     ui_->mp3selectWidget->hide();
     ui_->PlayerPlayingWidget->show();
     ui_->pushButtonPlayerPlayList->hide();
@@ -1432,11 +1459,23 @@ void f1x::openauto::autoapp::ui::MainWindow::on_mp3List_currentRowChanged(int cu
 void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerNextBig_clicked()
 {
     playlist->next();
+    if (playlist->currentIndex() != -1) {
+        player->play();
+        ui_->pushButtonPlayerStop->show();
+        ui_->pushButtonPlayerPause->show();
+        ui_->pushButtonPlayerPlayList->hide();
+    }
 }
 
 void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerPrevBig_clicked()
 {
     playlist->previous();
+    if (playlist->currentIndex() != -1) {
+        player->play();
+        ui_->pushButtonPlayerStop->show();
+        ui_->pushButtonPlayerPause->show();
+        ui_->pushButtonPlayerPlayList->hide();
+    }
 }
 
 void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerPrevAlbum_clicked()