Added some basic styling and fixed the templates