This is pretty good to have, for now don't merge the top half,
since it is intermingled with submenu redesign.