Add correct spacing to shape classes