Tweaking admin page for #17