refactor of the manager
Merge branch 'master' of github.com:OWOW/rich-page