Dev

Merging new styling from dev to master