resolved small styling conflicts