Reworked options dialog (Tested)