Cosmetic changes
Completed conversion to js app
Clean up controller