sidebar fix, and Line bug