WIP: Fix options dialog and controls