Updated with search&filter buttons