Fix minor layout issues