added tablelayout to remaining filter forms