layout adjustment
Merge branch 'master' into embedded