Adjust layout and validation

fning