Cleaned up last of non-semantic markup
Updated template file to new document structure