Tkt #826 : Invoice UI Upgrades