Rework StatusBar logic (1/2)