Some playground fixes
New playground layout - still under work
Merge pull request #769 from priand/playground

Playground