Improved input and animation