UI refinements
Merge branch 'playground'