Full functions (except comments can't have subcomments). Added some more navigation.

Poor navigation throughout the site...to be revisited