added Values combobox, re-arranged the layout