Added more to menu, mostly done.

Just need to smooth things.