revert user index layout changes and add key revoke event