More spacing fixing