Change app and views to use new db models