Updated styles
Merge origin/master