More improvements to Flexible Windows, and update Menus to use it. (#2)