Options menu and restructuring