navbar and template fixes