Add Show-Hide Tree option and some other fixes.