Changed method names and logic behind data fetching and form building.