Fix grid system. close #67