Added basic grid setup