Better GA tracking code
Persist query string in URLs, which currently only impacts the "popup" windows which can now be reloaded and clicked in without going out of popup mode.
Updated TODO