Comments in templates
Navbar for easier testing
Merge