Small improvements to admin