added tags, plus redesign of the contents