Fix stuff and remove this horrible animations