More minor layout fixes