fixing bugs and cleaning up admin view