Added navigation stuff.