Update layout

Merge updates to master