in the middle of fixing menus
Fixed errors in menus where adding somthing would not work.
Cleaned up the code a little;

Signed-off-by: Jonathan <jonathancw@me.com>