All view updated, links to map added, minor changes