Admin bugfixes and improvements