Update form latout and  revise events SQL table