Water: Better looking layer selection; disable "Draw" option for now