major UI and schema changes
Merge pull request #1 from ongoworks/eric

major UI and schema changes