Basic styling
Merge branch 'design'
company stuff