remove double occurence of make payment, also move items around some