change combobox to button and some small fixes