Fixes #204

Also moved admin stuff into admin controller.