reorder some data
shorten the HTML template
organize stuff by title