Optimized grid and added extra features