Added payment and code, fix ups on ui elements