[FIX] Adding in fees and total in the UI