Design and markup changes