Merge pull request #236 from emacsen/master

Converting done dialog into a react component
Resolving #239 and #238