better navigation handeling complete. Few tweeks needed still but overall complete