modification main + add navigation