changed admin view, bug fixes, templating junk