Fix help popup appearing in the wrong place
Fix modal appearing on wrong pages