functionnal navigation logic added