I have made some other changes and small fixes to the UI to make it more tidy, and fixed up the code in preparation for shipment.