Further work on menu