Some playground fixes
New playground layout - still under work