Updated padding and Margins