[WIP] Status bar fixes