Move and extend OptionWidget