Fixed problem with popup layout