Bug fixes
Refactored controller for extensibility of views
Minor Fixes