Merge pull request #26 from ashish-kalbhor/master

Refactoring Trigger Receiver
Changes in UI