Improved dealer UI and calculations