Popup re-style work
Merge pull request #179 from sammuel86/dev-0.3

Popup re-style work