Fix animations and focus error