Fix Button Layout by adding a GridLayout