Changed Filters by seperating UI part and functionality