Made some minor layout changes