We've resolved this column issue in the new update today - they now properly collapse/expand, as before they only did if the same line was also fully collapsed :)
Actually the suggestion on water sources we resolved exactly like you suggested above as well with the new UI