Added grid button & made relevant adjustments