Added grid layout and buttons