Various fixups to get tabbed windows more dynamic