Reorganized input / layout