added better navigation