Revert "Revert "Show Clients""

This reverts commit 3d75e2c046571a4903aa13bcab98b308863efaec, reversing
changes made to f9b14c8f23299b56b5f4f095e4b921ac10d9de6a.

reverted revert. Sounds bad but it is required