New primary "W" menu and secondary lesser-used-items menu.

Change-Id: I83a1ce9e69f3312fa4b4bde7c03c0ce4c64d1e70