before pull
merged
fix Grid, make Main Grid changeable