Add Grid Layout support isssue #29