Speed up animations, rework storyboard