Add minor layout adjustments

 - add minor layout adjustments for everything to look neat.