Updating pages to keep in line with backend refactoring.

Backend SHA: e503730c2793514b87a328cbf742a06eb8402b52