Working on getting the layouts into partials
Generalizing the items to fit the new pattern