Added image animation and changed ServiceLocator