Greatly improved the user interface