basic styling
Merge branch 'master' into development3