adding FormPublic / FormSettings and updating main class