Admin interface improvements.

See individual commits for more information.