updated calendar addressing #367 and #366
refactored uiCurrency for #362