Add activator
Change cookie handling
Add dialog