Added edit users
Corrected somes bugs