change lines to inputs instead of doing the input/span dance
Merge branch 'inputs'