fixed some (not all) touch issues and added a close button for the popups
Merge branch 'dev'