Improved options screen for #204