Changed menu

Work in progress