working on bugfixes still

With the new router, having to manually route somethings, mostly in admin
spaces.
May have to fix that.