App styling
Merge branch 'thomas'