Some more popup adjustments