Annotate and clean up admin panel #1138211