set up views
updated branch