Some more work on the "library" window