Fixes to the option screen