Moved data out and added info box