Animations, styling and code cleaning