Update layout for grid options

Spec:
https://screenshot.googleplex.com/HeqNgrqnsaiMoia.png
Screenshot (1-5 options):
https://screenshot.googleplex.com/4sShjAjyu2xC8nw.png
https://screenshot.googleplex.com/3TThvJLr8omoMsm.png
https://screenshot.googleplex.com/BpGbpTdzPSNGCt5.png
https://screenshot.googleplex.com/BM3z8g9mcrTktr3.png
https://screenshot.googleplex.com/BegfDpyXwvMw6j3.png

Fixes: 187138127
Test: Manually
Change-Id: I92c541ce54a5c3144d6048407b2434d468680ca5