Added 'books' and updated menu handling