added new methods for filter, almost fixed and changed states of buttons