Removed need for ugly converter in template.
Added handling so decimals are not lost.