working on menu
merging changes