fix(styles): design and style optimizations
Merge pull request #668 from fritzSF/master

fix(styles): design and style optimizations