Update on issue #35

Have made a subtle UI enhancement to this issue.
If you are ok with it , revert back and I will close this issue.