Better support for animations and onTouch / onClick