minor layout changes and a unified file