Design and popup changes