Improve record viewer