Tidy up paddings and margins