Started working on Library view