add proper navigation from links