Better organization of inputs, section headers.