Modified beans, dao to match data model and continued admin panel