Redesign submenu

Recent patches described on the reviews mailing list.  Peter, if you want to rebase these to edit them and then apply them here they are.