Fix calculation price
Refactor
improve ui