Slight reorg for sharing the route analysis information; minor theme fixes.