Fixed grid style bugs