some more tweaking in forms