Updated styling
Merge branch 'development' into qa