Better way to control column visibility