Added animations and cleaned up everythng