Add basic styling
Merge branch 'layout' into develop