Change menu to be more context oriented