Minor changes for grid and player views