Added navigation and minor fixes/comments