replaced popover with modal for flexibility
richer information
Merge branch 'master' of github.com:pmitros/x2