More Ui refinements
Merge branch 'playground'