Hopefully added the buttons and combobox ok