Results navigation fix

Sorry for the mess.

disregard anything except for the final push here.