cleanups; initial add of TWBS grid