remove some unneeded foundation stuff; minor layout changes