Added extra pages and support for generic views