more style and markup updates