Added directive
Merge conflict
Refactored list view
Clean useless code
Hot fix