Some minor layout improvements