Reordered metadata display and improves tags

addresses #171