Revert "transitional - fix some options problems + options UI"

This reverts commit 9dc0d263331ade7e54d1105c81bc925bcd7883f4.
Revert "Revert "transitional - fix some options problems + options UI""

This reverts commit c71822d67a824b9b13a905821a9f4c79c74220f9.