fix navigation, made it a lot cleaner