More work on pop-over.