Removed filter button and moved its actions over to the menu button.
Also removed some unnecessary code.