Improved .isActivePage
Moved text and submissions on different pages
Add some consistency for controllers