fixed some styles and text
merged