CORE-881 animation fix

CORE-881 animation fix and some visual improvements