81305030 reorg css

Includes a couple tweaks to popup while I was there.