Clean up strings.xml and add Filter menu item