Fixed bugs and added animation