Fixes bugs with new Options Menu