Working on menu implementation