Collapsed borders and better padding