Customise layout for M&P
Merge branch 'master' of github.com:starberry/osk