DMS,Class, and UI adjustments
Merge branch 'master' of https://github.com/nathanielasare/generationflux