tweak popup structure and style; update js to match
popup stuff