design changes

Buch of design changes. Adds new markup.