Working on settings menu, cleanup for Oscar