Initial commit: Workspace UI integration.

(integrated from master branch change 218cf1f by cgchoffman <cgchoffman@gmail.com>)