a day's work...
Re-organized views; collected all angular.js code into one file