Updated some view for new library model