Updates to Library detail. Requires a bunch of tidy up.