Feature/make navigation more configurable