Fixed UI: several popup have issues