adding better navigation