Some more work on pages and user management