fix format and add missing grid classes