Tidied up interface, cosmetic changes