More work on details pages and preserve view state correctly