Fix navigation bugs