Included GO button, and added back XML builder