fix event & add navigation