Fix indentation and clean up some unncessary output tags to hopefully make it easier to convert to a bootstrap theme
initial updates for new layout