Revert "fix conplicts"

This reverts commit b555adee73673d89c4e089321ab39b3862889dae.
Revert "UI not updated correctly in expanded statusbar"

This reverts commit 2740f69a885eb98838e476f9b516f7be1140b903.