Improved grid, added labels and emphasize