Add form and new bugs