Factor Fix

Broke factor popup when readjusting layout, this commit fixes it again.