fixed crazy buttons in nav-bar
Merge branch 'master' into LJK/buttons
Merge pull request #62 from jsum528/LJK/buttons

Ljk/buttons