edit read
adjust layout of main
Merge branch 'master' into dev