Fixed changes mentioned in UI feedback by Amir
Merge pull request #203 from karma-exchange-org/demo2

Fixed changes mentioned in UI feedback by Amir