Additional menu changes picked from the 2.7 beta