Cleaning up nav