Minor updates

Created new class Menu