Added filter and collapse methods and icons