Changed the main controller and view to hold the observable classes.
Some updates