Convert to single controller and Ajax call
Merge branch 'single_controller' into develop
Merge branch 'develop'