Update markup to match other templates
Remove unnecessary comments
Remove classes from bar
Add header type 2 (not working yet)