Updated animations and button support