added tablelayout to remaining filter forms

combining libraries
combining libraries