Upgrade UI animation
Fix screen on problem