ADD: Navbar and comments
ADD: Better spacing for nav
Merge branch 'feature/navbar' into develop