Improve perf on popup opening by delaying rendering
Restore previous display order (almost)

and remove "perf" improvement because I'm really not sure it changes
anything.