More #167 stuff and some admin page tweaking.