Replaced placeholders for faster loads. Also abstracted $scope in controllers and views