updating current pages to work in new framework