refactoring navigation element click part 1