improved ui, grid