Statusbar behavior (2/2)

Credit to andros11 for parts of this commit!
Small clean up