Some adjustments in popup