Added Grid Layout for the buttons

Adding Grid layout fixes the buttons cutting off caused my margin