Minor formatting changes. Add Grid layout.