refactored data model, changed some data access code
updates to admin section