reorg of t/ layout. more ovidish now.