Removed bad menu let code. Redid other stuff.

Signed-off-by: Aza <azaaza@gmail.com>