Styling

Merge styling into master