better close button and click labels
add remaining filters