fixed some styles
merge