Added nav date to be based from favorites and fixed several bugs