Solve style bugs