Display fixes for Adyen

I've attempted to make Adyen not look like comlete ass. I suspect
it didn't work too well though.

Change-Id: Ib3d31f9e63b18aa70cc4fe411165143feeb5623a
Merge "Display fixes for Adyen"