misc fixes, putting the file picker for the admin, refactoring Administrator and User models