Formatting getting a lot better.  But still kind of stuck on the
navigation.