Fixes to Sample Page