Feature/styling

Merge