updated the remaining pages to use database