Fixed nasty navbar toggle-button bug and fixed #18