Remove some gxt containers, and add hack to fix Chrome bug (see SWC-1450)