Fixed animation again, minor UI changes