redid some navigation