Added some branding, cleaned up templates