More vocabulary (nsfw), layout and style tweaks