CMS organization and styles
Merge branch 'master' of https://github.com/baBymAngo/catnap