Added popup modals
Merge branch 'master' of github.com:rvirani1/tbox