Fixed a few bugs in the templates, better css