Improve session view