Improved dealer UI and calculations
Merge remote-tracking branch 'origin/gh-pages'
Fixed some UI stuff