Cleaned up addon shelf