Fix styles issues