Improved several elements of the interface