Merge "GBP UI fixes"