implement some top level navigation
implemented race, cleaned up some stuffs