Modified layout and input.