Basic styles in place for layout and decoration
Merge branch 'feature/basic-styling' into develop