Improve workspace UI (back-end)