Bugs fixed, UI code tidied for Xanto