Updated admin pages
merge