Validation
updated the layout
updated tests