finished popup changes
Closes #19