clean up and toggle
working popup