Added borders for grid
Updated button color to white