Some minor layout fixes