am ac395aae: am d4abdd27: Reorganize users screen

* commit 'ac395aaed59a70cb2b2eb36fa3b935cb0d12b20f':
  Reorganize users screen