Layout and markup changes