Unnecessary library deleted
Views refactored