Changed modal behavior

I am not sure if I have to keep using angular ui router.
Merge pull request #25 from CoderSpinoza/modal-fix

Changed modal behavior