Updated button grid