Fixed some navigational stuff