Better working forms, cleanup, select all working