Added grid layout and id buttons