added padding for borders
Merge remote-tracking branch 'origin/gaps' into gaps-next