Cleaner version of admin-tools, needs bug checking