clean up admin view and add comments