popup.xml: various formatting fixes