Added minor layout changes