2.5.0 beta 2

Admin Fixes