working on styles
Merge branch to 'master'