Improve unit display and calculation