change text and database structure
fixed role structure