changed styles around
merged