updated remaining pages to use new Db class