Fixing filers, other ui tweaks