fixed header and broken lists