Cleaned up the templates and styles a bit.