got rid of extra file; merged admin stylesheets; minor work on admin templates