Adding some color and some minor layout changes