Another take on form padding fix.