Merge "Github#7 - value page redesign"