modify layout on payment page & resolve conflict