#15 resolve the navigation issue (frontend timings)