Changed form setup