Fix PH 5.4 error and Cleanup

Fix PH 5.4 error and Cleanup

- Pass `$controller` to form
- Add ccm-ui wrapper
- Remove closing `?>`

http://www.concrete5.org/developers/bugs/5-6-2-1/php-warning-on-add-blockadd-date-navigation-page/