More updates to the forms