Updated rester data presentation and more fixes on sample data