Grid system added

And other changes.