Little fixes on generate_admin
Fixes on admin
Fixes on admin functions