deleted not anymore needed buttons and checkboxes

and fixed one bug