Fixes for issues 21 and 42 isolated

I isolated fixes for different issues from you topbar branch @sebastianconcept. Look over them and accept them if correct (I tested manually and they work).

After merging this into master you should `git pull` while in master and then `git rebase master` while in `topbar` to get on top of them, solve conflicts and make those commits containing them smaller or empty.