removing/changing styles
removing styles
removing styles
small changes
Merge branch 'development'