Cleaned up the logic of displaying columns heavily