more work on the views, added initial support for data-based pages