Added some necessary styling
Merge branch 'development'