better form structure
small code fix
minor contact bug fix