Fix formatting issues on top bar, fixes #34