More fix more statusbar logic