First step in change to fragment based layout