better button and span selectors fix #6