Working. 
Moved the Edit Units Dialog to its own class.