updated to use new base activity and new base popup activity