Client side display handle changes

Mostly bug fixing and changes to client side display.

Jira Issue: WP-528