Admin Interface + minor tweak

by MD Debranski