Making some modifications to Edit User and Index