main controller and service refactored
added ng-cloak to ng-view