bug fixes in FI
Merge remote-tracking branch 'upstream/ui-dev' into ui-dev
Merge pull request #64 from amansinh/ui-dev

Ui dev