Added loading, added transition animations