Cosmetic: Some margin and border adjustments.