Modified FilterBy view - added two new buttons