more intuitive navigation. updated links