Small margins and padding fixes
Small margins and padding fixes