Added Nav. Fixed 118 bug.