Fixed minor bugs
Merge remote-tracking branch 'origin/grid-combo' into grid-combo