Some cleanup before adjusting to new desing
Adjust to new BBP layout and simplify xpath