Bring back normal navigation when popup is closed

2 things remaining now, code wise :
1. Fix one popup location issue
2. Implement the insert method again.