Grid formatting fixed