Fixing styles and cleaning up templates up a little bit