Fix spacing issues
Ensure columns are sorted correctly