Ux/conversion rate

Closes #1387