Resolved some animation & preferences bugs