Removed buttons, changed the Entity-class