minor layout and padding changes