Template changes
Next iteration of UI
Merge branch 'master' into styling-templates
Merge branch 'master' into styling-templates
Added background images
Merged