Merge "Update layout for grid options" into sc-dev