Made a better Menumanagement