New layout
Added code
Edited design
Merge branch '2-pane-layout'