General tidy
Added filter button