admin pages changes
merge