Minor design changes and book searching logic