UI changes from Simon
Some more UI changes from Simon