Minor updates and move Japanese language toggle inside the grid