cleanup and column title fix