some styling added to pop up
Conflicts resolved
Merge pull request #19 from otorres86/master

styled pop up