changed some styles
merged