more improvements
first pass at integrating our layout