Finish up admin tool