Improve trademark view, closes #1