More navbar items

* More navbar items
* small tweaks/bug fixes