Fixing bugs on forms redesign