More navigation naming & structure changes, and icons.

A few more changes for issue #39