Polished the layout of the pop-up