Fix issue with positioning and collapsing lines
Fix issue with positioning in small views