Made some css changes
Merge branch 'development'