changes to layout an other validations