Finished Nav and Storage