Fixed merge, activity indicator bug and other UI bugs
Reverted animation changes