cleanup

removed most markup from templates