Add grams-to-kilos helper and fix tables