Added buttons and combo box