Improved margin & padding