some changes to admin section, moving the db tools behind the admin wall for security
fixed merge diffciulties and commiting