Fix Layout and Behavior of Options Dialog

The options dialog was not displaying correctly because the widget was
not being added to the layout (I forgot to review the port in this
case). Also, the cancel button had no effect because it was hoooked to
the parent dialog's reject.