messing aroung with UI and client commands.
Fixed a merge conflict