Added button grid again