Improved data parsing and display