Fixed a couple of minor layout issues