Minor design tweaks with spacing and margins