UI Improvements - Users Client Side - Fixes #194