working on better navigation - step 1