Remove ng-view, Merge back, Fix angular Errors