Added animations and direct buttons