update layout, add panels
Merge branch 'master' into production