Add gray to admin_dashboard
Fix merge conflicts