Improved the UI very little.