change to router to fix popups