More navigation naming & structure changes, and icons.
Merge pull request #40 from carlmon/NavChanges

More navigation naming & structure changes, and icons.