Updated features/intertwine_layout_2013