Fixed animations stuff and added boxes