Removed unnecessary routes
Simplified model/view/controller behaviour
Simplifications and clean ups
Cleaned up views
Minor changes
Fixed data merging