refactored the lists and the filters on the right hand side