Fixed some minor layout issues