Added serviceLocator,auth. Refactored view