Cleaned up some column templates