Updated template elements for 3.0. Made html follow proper heading hierarchy Optimized generated html so it can be more easily styled.