Merge pull request #664 from fritzSF/master

fix(styles): general style changes
fix(styles): design and style optimizations