Padding edits

Better padding and margins in the wrappers