updates and cleanup to admin/www
fixed conflict and cleanup