Fix some minor layout issues