Major menu improvements