minor layout changes and some color corrections