Updated popup layout