move templates
fixup admin
finishing up the admin