Working on contact and navigation