Fixes for samples/sample35.rb

Resolves #542 for remaining layout oddities.

Also removing repetition, tightening things up.