Form Creator - Final changes before demo