Bug fixes to layout in data.html