Navigation Additions

Problem fixes