first pass at layout maintenance complete