Refactored to use configured navigation

Signed-off-by: Thomas Lahn <thomas.lahn@scout24.ch>