Fix a bug with and tidy up options menu some more