Bugs fixed. UI-improved. Librarian - done