Add tags too
Merge pull request #1 from mnmly/redesign

Redesign