adding navigate and loading