Payment Screen fix