Fix modal bug in pull #272 and do cleanup.
Merge pull request #273 from karma-exchange-org/ui-improv-11-21

Fix modal bug in pull #272 and do cleanup.