Spacing problems fixed