fixed form and added ID