Improved the UI even more.