transitional-testing
transitional - fix some options problems + options UI