Update #8

More menu changes