Add modal and some modifications
Merge pull request #4 from dhuyy/master

Add modal and some modifications