More Ui refinements... Slow steady climb to the Top :)
Merge branch 'playground'