Some fixes, removed support for animated buttons
fix