add animation and fix UI