More work on input layout.