change grid to block fix major code style and comments