First pass to clean up Book Library screen