Updated forms so that they inherit FormNewBase...