Merge branch 'development'
Adds some new markup and styles
Merge branch 'master' into development