Added animations, tweaks