Remove hbox and use grids