Fixed the form problems that were requested