Redesigned options screen, not done yet