Improve trademark view, closes #1
regen for 6f97ecb