player integration
Merge branch 'layout-mh' into layout-cs