css cleanup and minor layout fix