TIY-Q2-FEE-CHS/trinity — pull request #17 by CraftyDevon (2014-05-16 14:08:07+00:00)
Title: Getting the styles back to normal, 

Did some rearranging on the templates as well