Fixed navigation bug and wrapped method comments
Renamed helper