New custom items and better links