Extensive work on menu