Getting the styles back to normal, 

Did some rearranging on the templates as well