Added changing buttons, options