added grid and viewport