added: fully functional navigation (hopefully)
merged