Add popup and other functionality

Describe more here...