Adjusted padding and margins for border-box