updated templates, change logo, cleanup