Fixes and cleanup of req popup