fixed validation errors & margin