More cleanup Library tabs