unclutter menues a little
whitespace
fix active state
no need to have this twice
Merge pull request #494 from git-marijus/master

unclutter menus a little