more style and minor layout changes