More menu work.

Still not nearly done.