Enhanced menu with class-ability, fixed #5