Created grid and fixed codebase