Updated Padding and Borders