Improve workspace UI