Refactored filtering code for easier maintenance and adding of new entries
Adjusted toolbar icons on main screen