Fix row rendering and remove css