changed the buttons into free buttons - todo: contribution