Form errors improved