changed admin styles etc
merge from origin/master