Fixing code review
code review fixes
added tablelayout to remaining filter forms
combining libraries