81305030 reorg css

Includes a couple tweaks to popup while I was there. 
Minor: I'd use Sass variables to calculate these numbers, so they stay up-to-date.