general style and markup changes