Added some styling
Merge branch 'master' into styling
Added some more styling