move and align cells

Hi all,

I have a task that I need to perform every now and then. And even though I normally find my ways around in Excel, I can't find a working solution for this one.

I have a list of features that I need to match with another list and place them on the same rows in my sheet. The attached file contains 2 worksheets where "Before" shows my normal input, and "Wanted" shows what I need to do.

Cols A-E contains info for the first set of features, cols G and H is the cells I want to move. Please note that sometimes the G and H columns contains info that are not present in A-E, and then I need to move those features around as well. An example is present at the bottom of the "Wanted" sheet.

I would really appreciate some help as this is taking me forever...