Lots of Changes see description

Attempted to make nav default across all activities but was
unsuccessful. Make Units activity and have begun sorting out objects