Add GridLayout

1、Add GridLayout
2、Resolve some bugs