more pad/margin tweaks