Fixed clicking on list items
Refactoring around overall architecture