stab at fixing #3: should work, layout creates a bit of a vacuum... (computed values should use a checkbox?)