Spacing issues resolved