Update with revised PopUser module and Router functionality