removed country edit index
rework and add comments