Updated views with pagination