Moving to the new layout system