Added padding to wrapper.
Moved border and added spacing.