Better layout for the popup on clean