Fix some stuff
More stuff and wider rows