Added UI control for drainage basins (currently causes error due to draw method)
Removed some defunct draw flags