a lot of minor layout changes