Spacing and position fixes

Spacing and position fixes