fixed styles
merged