#1 refactor DB, single page