Reworked navigation and account/admin templates