Feature/navigation improvements

* fixed a few navigation bugs
* fixed hide button bug
* fixed button gap