Improve workspace indicators
Improve workspace keys