Added completed buttons, new form"