Some minor display tweaking
Ensure that all metadata is included. A cleaner solution will be possible when issue #80 is resolved