Style view
More fixes
Merge branch 'master' of https://github.com/joekode/snipped