improved styles
Merge origin/master