navigation fixed. more improvements coming.