Fix PH 5.4 error and Cleanup

Fix PH 5.4 error and Cleanup

- Pass `$controller` to form
- Add ccm-ui wrapper
- Remove closing `?>`
Merge pull request #1382 from mkly/fix_date_nave_php54_and_cleanup

Fix PH 5.4 error and Cleanup