Final changes to forms