Styling Changes
Merge branch 'Daniel'