Some animation fixes, some CSS fixes..
Fixed some merge conflicts