Align tags

While we're at it. Related to issue #12, maybe?