Moved around the data and maps section a bit