New Data Forms Loading

Types can be turned off and on
All types displaying in legend
Bugs - time out bar not hiding, Lots broken