Update layout
Fix merge conflict
Update panelpage theme and grid flexbox