Updated menus to use options. Increased user test coverage.