minor reorg of layout/css