Adding tabs, colored and lettered markers, improving filtering