Upgrades, Little Reorganization and SVG Nav with Fall Back