Changed layout to use grid layout for buttons