Tools and maintenance messages

Styling, refactoring of markup