small changes to Menu

There still some stuff I can't test or instantiate, look through the cpp
for comments