Switch to new layout
Re-construct layout