popup confirmation logic fixed
nav item active changed
Merge pull request #22 from larrycinnabar/master

popup fix