adding styling
Merge branch 'Styling'