remove dropdown, button filter; move filter button to top; clean code