Revert "Bug fixes to sample page"

This reverts commit e1a5f3c29276e8ebe5efe5480bdfafad7864fa6f.
Revert "Revert "Bug fixes to sample page""

This reverts commit 664b1e10f933e0d123a06f2211275800796699ab.
Revert "Bug fixes to sample page"

This reverts commit e1a5f3c29276e8ebe5efe5480bdfafad7864fa6f.