updates to navigation

using two-dimensional arrays to simplify navigation,