Update carousel & Add block-grid support