Minor Updates to Form