Fix css styles and markup