Draft navbar, template updates

Also some reorganization and abstrating of templates