Merge pull request #5 from inon/dev

Dev
pop ups with navbars
Merge pull request #8 from inon/issue-6

Pop ups and navbars
Merge pull request #9 from inon/master

Master