Finished fixing the navigation