Better tags, restructured

Links are unclickable, reverted to shorter form