complete style and markup updates