Menu update.

Menu theoritically is ready, but needs a lot of debugging.