Got Edit Screen to pull data correctly