100% functional admin pages, visual and minor details pending, migrating to master