Various tweaks and a broken export CSV btn