Add animation and fix border.