CLSN-2012 Manual Payment Screen : Test and fix all issues