Revert "small fixes and the nav-notifications-template is still needed for notifications"

This reverts commit 4d8162282ea82976a7ceb79a8f8af1cbc3c2e195.

Conflicts:
	view/tpl/nav.tpl